gdk: rename gdk_drag_context_get_action() to gdk_drag_context_get_selected_action()

so its purpose is clear.
(cherry picked from commit d393cb377c60a4de9cab1d026acccafed1e34ec1)

diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols
index 379ec2887fce94defc4f75bc8a3dce914ab07152..d58b3dd7ff374637f5f137b00bac7f2ffdcd7f1d 100644 (file)
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
@@ -591,8 +591,8 @@ gdk_drop_reply
 
 #if IN_HEADER(__GDK_DND_H__)
 #if IN_FILE(__GDK_DND_C__)
-gdk_drag_context_get_action
 gdk_drag_context_get_actions
+gdk_drag_context_get_selected_action
 gdk_drag_context_get_suggested_action
 gdk_drag_context_list_targets
 gdk_drag_find_window

diff --git a/gdk/gdkdnd.c b/gdk/gdkdnd.c
index 1b4ca7ae04ac8e31932050f71617c33ef2399f3c..f4d2332b7ace7b8ae4ce9b5654b30821c207404f 100644 (file)
--- a/gdk/gdkdnd.c
+++ b/gdk/gdkdnd.c
@@ -143,7 +143,7 @@ gdk_drag_context_get_suggested_action (GdkDragContext *context)
  * Since: 2.22
  **/
 GdkDragAction
-gdk_drag_context_get_action (GdkDragContext *context)
+gdk_drag_context_get_selected_action (GdkDragContext *context)
 {
   g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), 0);
 

diff --git a/gdk/gdkdnd.h b/gdk/gdkdnd.h
index 2b6ceb04069243977a696d341370eeb5697dd580..c6a8079d4020cec4bec43a1c4cdbe2ba4a4979a5 100644 (file)
--- a/gdk/gdkdnd.h
+++ b/gdk/gdkdnd.h
@@ -114,7 +114,7 @@ GdkDevice *      gdk_drag_context_get_device           (GdkDragContext *context)
 GList           *gdk_drag_context_list_targets         (GdkDragContext *context);
 GdkDragAction    gdk_drag_context_get_actions          (GdkDragContext *context);
 GdkDragAction    gdk_drag_context_get_suggested_action (GdkDragContext *context);
-GdkDragAction    gdk_drag_context_get_action           (GdkDragContext *context);
+GdkDragAction    gdk_drag_context_get_selected_action  (GdkDragContext *context);
 
 /* Destination side */